checkout: Support --union-identical and --force-copy{,--zerosized}
authorColin Walters <walters@verbum.org>
Thu, 11 Oct 2018 18:35:23 +0000 (14:35 -0400)
committerAtomic Bot <atomic-devel@projectatomic.io>
Thu, 11 Oct 2018 20:49:54 +0000 (20:49 +0000)
commit9367a1befe045663a69265e10e0b4593068649e4
treeaaf6016150a2495a3499f64d1a578d78007bc40a
parent673cacd633f9d6b653cdea530657d3e780a41bbd
checkout: Support --union-identical and --force-copy{,--zerosized}

Actually testing the patch to add `--force-copy-zerosized` to
rpm-ostree tripped over the fact that it uses `--union-identical`,
and we just hit an assertion failure with that combination.

Fix this by copying over the logic we have for the hardlink case.

Closes: #1753
Approved by: jlebon
src/libostree/ostree-repo-checkout.c
tests/basic-test.sh